Acquire GDK lock. (#314533, Thomas Fitzsimmons)

2005-08-25  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* gtk/gtkfilesystemmodel.c (idle_finished_loading_cb): Acquire GDK
	lock.  (#314533, Thomas Fitzsimmons)

diff --git a/ChangeLog b/ChangeLog
index e68d25f1c4b3e9c040929a3ecd1c70d8ec0bfb3c..ab515b11c64083ab1fa1dadba80e8b4fce5c49be 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-25  Thomas Fitzsimmons  <fitzsim@redhat.com>
+
+       * gtk/gtkfilesystemmodel.c (idle_finished_loading_cb): Acquire GDK
+       lock.  (#314533, Thomas Fitzsimmons)
+
 2005-08-25  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtktoolbar.c (_gtk_toolbar_elide_underscores): Handle

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e68d25f1c4b3e9c040929a3ecd1c70d8ec0bfb3c..ab515b11c64083ab1fa1dadba80e8b4fce5c49be 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-08-25  Thomas Fitzsimmons  <fitzsim@redhat.com>
+
+       * gtk/gtkfilesystemmodel.c (idle_finished_loading_cb): Acquire GDK
+       lock.  (#314533, Thomas Fitzsimmons)
+
 2005-08-25  Matthias Clasen  <mclasen@redhat.com>
 
        * gtk/gtktoolbar.c (_gtk_toolbar_elide_underscores): Handle

diff --git a/gtk/gtkfilesystemmodel.c b/gtk/gtkfilesystemmodel.c
index b841b95fd06d161fbcec9933026641bb65efd22e..54676bd240be0778f580c0c19bd99a10ee6a8745 100644 (file)
--- a/gtk/gtkfilesystemmodel.c
+++ b/gtk/gtkfilesystemmodel.c
@@ -685,11 +685,15 @@ root_folder_finished_loading_cb (GtkFileFolder      *folder,
 static gboolean
 idle_finished_loading_cb (GtkFileSystemModel *model)
 {
+  GDK_THREADS_ENTER ();
+
   g_signal_emit (model, file_system_model_signals[FINISHED_LOADING], 0);
 
   g_source_destroy (model->idle_finished_loading_source);
   model->idle_finished_loading_source = NULL;
 
+  GDK_THREADS_LEAVE ();
+
   return FALSE;
 }